volume: Pick up hasHeadphones from the signal handler

A preliminary patch for big cleanups happening soon.

https://bugzilla.gnome.org/show_bug.cgi?id=690539

diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 859b403ca2f699ba7edf0fa3df09c5f555c460c8..b1774fc887c7948d347ae6b2ee91c7a17252c220 100644 (file)
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -33,7 +33,7 @@ const VolumeMenu = new Lang.Class({
     _init: function(control) {
         this.parent();
 
-        this.hasHeadphones = false;
+        this._hasHeadphones = false;
 
         this._control = control;
         this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
@@ -100,8 +100,8 @@ const VolumeMenu = new Lang.Class({
     },
 
     _portChanged: function() {
-        this.hasHeadphones = this._findHeadphones(this._output);
-        this.emit('headphones-changed');
+        this._hasHeadphones = this._findHeadphones(this._output);
+        this.emit('headphones-changed', this._hasHeadphones);
     },
 
     _readOutput: function() {
@@ -231,8 +231,8 @@ const Indicator = new Lang.Class({
             this.actor.visible = (icon != null);
             this.setIcon(icon);
         }));
-        this._volumeMenu.connect('headphones-changed', Lang.bind(this, function() {
-            this._headphoneIcon.visible = this._volumeMenu.hasHeadphones;
+        this._volumeMenu.connect('headphones-changed', Lang.bind(this, function(menu, value) {
+            this._headphoneIcon.visible = value;
         }));
 
         this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'headphones-symbolic' }));